Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/21b4c2aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/21b4c2aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/21b4c2aa Branch: refs/heads/master Commit: 21b4c2aac335ea101284f698494b6bc120b4281c Parents: d85c6ec 7ec6627 Author: williamstw <[email protected]> Authored: Thu Sep 12 19:47:41 2013 -0400 Committer: williamstw <[email protected]> Committed: Thu Sep 12 19:47:41 2013 -0400 ---------------------------------------------------------------------- .../main/resources/notices/metrics-core-2.2.0.jar.NOTICE | 11 +++++++++++ .../resources/notices/metrics-ganglia-2.2.0.jar.NOTICE | 0 .../resources/notices/metrics-graphite-2.2.0.jar.NOTICE | 0 .../resources/notices/metrics-servlet-2.2.0.jar.NOTICE | 0 .../main/resources/notices/zookeeper-3.4.5.jar.NOTICE | 5 +++++ 5 files changed, 16 insertions(+) ----------------------------------------------------------------------
