Merge branch '0.2-dev-patch' into 0.2-dev-removing-old-thrift
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/1f6a34cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/1f6a34cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/1f6a34cc Branch: refs/heads/0.2-dev-removing-old-thrift Commit: 1f6a34cccfe084ed39b594e1a8daec86d33d62ff Parents: 0996b6a c668700 Author: Aaron McCurry <[email protected]> Authored: Thu Nov 8 21:59:40 2012 -0500 Committer: Aaron McCurry <[email protected]> Committed: Thu Nov 8 21:59:40 2012 -0500 ---------------------------------------------------------------------- src/pom.xml | 181 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 115 insertions(+), 66 deletions(-) ----------------------------------------------------------------------
