| commit | 195318adac454c9ca012d14d52a7a084cfad2bd6 | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Fri Aug 30 17:33:16 2013 -0700 |
| committer | zheilbron <zheilbron@gmail.com> | Fri Aug 30 17:33:16 2013 -0700 |
| tree | af616074c00572fec74e505dc4a5629715797aa5 | |
| parent | 27a858db2085f5ccf25028b5b89b1c4f755a54c8 [diff] | |
| parent | 9ee649f15d70d4953bdede11796b9d0e31fc88b9 [diff] |
Merge remote-tracking branch 'origin/raman/master_feeds' into zheilbron/asterix_msr_demo Conflicts: asterix-aql/src/main/java/edu/uci/ics/asterix/aql/expression/ConnectFeedStatement.java asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/feeds/FeedUtil.java