Merge pull request #4 from remind101/units

Phalanx -> units
remind101 · Feb 11, 2015 · 4ca5ddb · 4ca5ddb
2 parents d23ca93 + ecfcebf
commit 4ca5ddb
Show file tree

Hide file tree

Showing 30 changed files with 5,926 additions and 5 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/hashicorp/consul/api/README.md b/Godeps/_workspace/src/github.com/hashicorp/consul/api/README.md
diff --git a/Godeps/_workspace/src/github.com/hashicorp/consul/api/acl.go b/Godeps/_workspace/src/github.com/hashicorp/consul/api/acl.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/consul/api/acl_test.go b/Godeps/_workspace/src/github.com/hashicorp/consul/api/acl_test.go