commit 62105def56cead0c8d912aeff077c4ab26058522
author Andy Bavier <acb@cs.princeton.edu> Fri Apr 15 14:17:11 2016 -0400
committer Andy Bavier <acb@cs.princeton.edu> Fri Apr 15 14:17:11 2016 -0400
tree 0f64fe5008eaf722e77082ef9967524a685707e9
parent f83b18aea4860ccde4a5b9437f061fe2a92a1730
parent 95729f85be4a63f6ed1ede78ceb5f07f26fe005e

Merge branch 'master' of github.com:open-cloud/xos

xos/configurations/cord/ceilometer-plugins

diff --git a/xos/configurations/cord/ceilometer-plugins b/xos/configurations/cord/ceilometer-plugins
deleted file mode 160000
index 87cd53b..0000000
--- a/xos/configurations/cord/ceilometer-plugins
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 87cd53b99e43b12f2a175a65440f02f53b564069

xos/tests/api/.gitignore

diff --git a/xos/tests/api/.gitignore b/xos/tests/api/.gitignore
deleted file mode 100644
index 3c3629e..0000000
--- a/xos/tests/api/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules