Clone Tools
  • last updated 23 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

  1. … 8 more files in changeset.
minor changes to feed console

  1. … 7 more files in changeset.
merge from zheilbron/asterix_msr (checkpoint 3)

  1. … 3 more files in changeset.
fault-tolerance checkpoint

  1. … 34 more files in changeset.
added basic feeds robustness test; testing behavior upon a cluster restart

  1. … 24 more files in changeset.
checkpoint

  1. … 8 more files in changeset.
checkpoint

  1. … 14 more files in changeset.
added test case for fault-tolerance

  1. … 12 more files in changeset.
checkpoint

  1. … 54 more files in changeset.
merged raman/asterix_lsm_stabilization_udfs

  1. … 35 more files in changeset.
checkpoint

  1. … 20 more files in changeset.
merge from master

  1. … 47 more files in changeset.
checkpoint post merge from master

  1. … 26 more files in changeset.
completed merge from master

  1. … 39 more files in changeset.
checkpoint

  1. … 18 more files in changeset.
merge from master

    • -1
    • +1
    ./edu/uci/ics/asterix/event/model/ProcessInfo.java
  1. … 135 more files in changeset.
add/update license headers

  1. … 1224 more files in changeset.
Merge master into raman/asterix_lsm_stabilization_coredump.

  1. … 16 more files in changeset.
checkpoint

  1. … 14 more files in changeset.
saving state

  1. … 11 more files in changeset.
checkpoint

  1. … 3 more files in changeset.
saving state

    • -0
    • +25
    ./edu/uci/ics/asterix/event/error/EventException.java
    • -0
    • +89
    ./edu/uci/ics/asterix/event/error/OutputHandler.java
    • -0
    • +126
    ./edu/uci/ics/asterix/event/error/VerificationUtil.java
    • -0
    • +190
    ./edu/uci/ics/asterix/event/model/AsterixInstance.java
    • -0
    • +53
    ./edu/uci/ics/asterix/event/model/AsterixRuntimeState.java
    • -0
    • +68
    ./edu/uci/ics/asterix/event/model/BackupInfo.java
    • -0
    • +33
    ./edu/uci/ics/asterix/event/model/EventList.java
    • -0
    • +54
    ./edu/uci/ics/asterix/event/model/ProcessInfo.java
    • -0
    • +63
    ./edu/uci/ics/asterix/event/service/AsterixEventService.java
    • -0
    • +495
    ./edu/uci/ics/asterix/event/service/AsterixEventServiceUtil.java
  1. … 94 more files in changeset.
checkpoit

  1. … 106 more files in changeset.
removing unused imports

  1. … 1 more file in changeset.
merge from master

  1. … 26 more files in changeset.
merge from master

  1. … 6 more files in changeset.
resolving build fix

  1. … 1 more file in changeset.
fix for issue 376: Need to classify and properly treat all built-in functions in AQL

  1. … 32 more files in changeset.
fixed an issue related to incorrect plugging of cc.java.opts parameter, changed property naming convention for asterix-build-configuration.xml

  1. … 3 more files in changeset.
1) modification to remove unnecessary environment variables (cc_java_opts/nc_java_opts) 2) changed option name for alter command 3) removed java_opts parameter from cluster configuration xml

  1. … 5 more files in changeset.