You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2014/01/28 23:37:50 UTC

[2/3] git commit: Merge branch 'master' of git://git.apache.org/incubator-phoenix

Merge branch 'master' of git://git.apache.org/incubator-phoenix


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/6b832bc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/6b832bc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/6b832bc1

Branch: refs/heads/master
Commit: 6b832bc1ae0ab9cbdfe6e8f1a9cbd22bbc39e3fd
Parents: 73a2e60 f71b0c5
Author: maryannxue <ma...@apache.org>
Authored: Tue Jan 28 17:00:14 2014 -0500
Committer: maryannxue <ma...@apache.org>
Committed: Tue Jan 28 17:00:14 2014 -0500

----------------------------------------------------------------------
 phoenix-core/src/site/bin/merge.jar        | Bin 0 -> 1347 bytes
 phoenix-core/src/site/markdown/building.md |   9 +++++++--
 phoenix-core/src/site/markdown/source.md   |   8 ++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------