Merge pull request kubernetes#4766 from mikedanese/remove-util-merge

Remove pkg/util/merge and replace with evanphx/json-patch
justinsb · Feb 25, 2015 · 3f69112 · 3f69112
2 parents e152c67 + 88e1ab3
commit 3f69112
Show file tree

Hide file tree

Showing 11 changed files with 1,411 additions and 131 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/evanphx/json-patch/.travis.yml b/Godeps/_workspace/src/github.com/evanphx/json-patch/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/evanphx/json-patch/LICENSE b/Godeps/_workspace/src/github.com/evanphx/json-patch/LICENSE
diff --git a/Godeps/_workspace/src/github.com/evanphx/json-patch/README.md b/Godeps/_workspace/src/github.com/evanphx/json-patch/README.md
diff --git a/Godeps/_workspace/src/github.com/evanphx/json-patch/merge.go b/Godeps/_workspace/src/github.com/evanphx/json-patch/merge.go