You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2014/10/20 08:41:11 UTC

[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix


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

Branch: refs/heads/master
Commit: 91004269ad1f51f4fba86f08d22776e6141fe82f
Parents: 1ceacce b8f32ae
Author: James Taylor <jt...@salesforce.com>
Authored: Sun Oct 19 23:47:00 2014 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Sun Oct 19 23:47:00 2014 -0700

----------------------------------------------------------------------
 bin/end2endTest.py                              | 16 +++++----
 bin/phoenix_utils.py                            | 34 +++++++++++++++++---
 bin/psql.py                                     |  2 +-
 bin/sqlline.py                                  |  2 +-
 .../phoenix/iterate/SpoolingResultIterator.java |  2 +-
 5 files changed, 42 insertions(+), 14 deletions(-)
----------------------------------------------------------------------