Clone
 

zheilbron <zheilbron@gmail.com> in asterixdb

Fixed issues 698 and 699. Also added JSON printers for UUIDs

The following commits from your working branch will be included:

commit 956ec767c369f4b238ad98b260b8fe83b1b5ea40

Author: zheilbron <zheilbron@gmail.com>

Date: Fri May 16 10:50:15 2014 -0700

fix issue 698

commit 8e0fd4d8ea6779e8ced4ee8001ccff70c7ac97ab

Author: zheilbron <zheilbron@gmail.com>

Date: Fri May 16 10:36:22 2014 -0700

add JSON printers for UUIDs

commit 2b550b3646255c6c9dca95d16cb78d075ec22205

Author: zheilbron <zheilbron@gmail.com>

Date: Fri May 16 10:10:41 2014 -0700

fix issue 699

Change-Id: I096505bdb5d4ab0f0dbbc46d15349a2c5682fe29

Reviewed-on: http://fulliautomatix.ics.uci.edu:8443/32

Reviewed-by: Inci Cetindil <icetindil@gmail.com>

Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>

Merge branch 'master' into documentation

fix packaging of docs; fix links in docs for demos and js api

Merge branch 'master' into documentation

add docs for sql-* aggregates; revise switch case docs

    • -0
    • +131
    /asterix-doc/src/site/markdown/aql/functions.md
one more rename: adm101 -> admaql101; expand documentation for bundled demos

    • -0
    • +27
    /asterix-examples/src/main/assembly/admaql101-demo-binary-assembly.xml
  1. … 20 more files in changeset.
rename blackcherry -> tweetbook; package demos as zips; rename intro -> adm101

    • -0
    • +27
    /asterix-examples/src/main/assembly/adm101-demo-binary-assembly.xml
    • -0
    • +27
    /asterix-examples/src/main/assembly/tweetbook-demo-binary-assembly.xml
    • -0
    • +19
    /asterix-examples/src/main/resources/adm101-demo/README.md
    • -0
    • +47
    /asterix-examples/src/main/resources/adm101-demo/admaql101.py
    • -0
    • +3256
    /asterix-examples/src/main/resources/adm101-demo/bottle.py
    • -0
    • +531
    /asterix-examples/src/main/resources/adm101-demo/demo.tpl
  1. … 65 more files in changeset.
update js sdk docs

update interval-bin doc

    • -117
    • +117
    /asterix-doc/src/site/markdown/aql/functions.md
Merge branch 'master' into eugenia/black_cherry_stable

copy sdk to doc site when packaging; add more documentation about javascript sdk

    • -14
    • +519
    /asterix-doc/src/site/markdown/aql/js-sdk.md
    • -0
    • +19
    /asterix-examples/pom.xml
    • -0
    • +1045
    /asterix-examples/src/main/resources/asterix-sdk-stable.js
Merge branch 'master' into eugenia/black_cherry_stable

updated the documentation for the transaction model on behalf of youngseok

updated the documentation for the transaction model on behalf of youngseok

add unrestricted REST endpoint

Merge branch 'master' into lsm_storage_experiments

remove useless gitignores that Eclipse generates

Merge branch 'master' into eugenia/black_cherry_stable

Conflicts:

asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/RESTAPIServlet.java

asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java

use 0.2.11-SNAPSHOT dependencies for algebricks and hyracks

use snapshot dependency in asterix rather than release

Merge branch 'zheilbron/asterix_msr_demo' of https://code.google.com/p/asterixdb into zheilbron/asterix_msr_demo

Merge branch 'zheilbron/asterix_msr_demo' of https://code.google.com/p/asterixdb into zheilbron/asterix_msr_demo

use the typeheirarchy for type checking in the admdataparser

change spatial type constructors to return null if a null argument is passed in

partially fix issue 602

partial fix for issue 676

add import that got screwed up in the merge

Merge branch 'master' into zheilbron/hyracks_msr_demo

Merge branch 'master' into zheilbron/asterix_msr_demo

fix conflict in comment