Commit Graph

8 Commits

Author SHA1 Message Date
Avi Kivity
ebaeefa02b Merge seatar upstream (seastar namespace)
- introcduced "seastarx.hh" header, which does a "using namespace seastar";
 - 'net' namespace conflicts with seastar::net, renamed to 'netw'.
 - 'transport' namespace conflicts with seastar::transport, renamed to
   cql_transport.
 - "logger" global variables now conflict with logger global type, renamed
   to xlogger.
 - other minor changes
2017-05-21 12:26:15 +03:00
Calle Wilund
cb7ee98217 json: Add convinience ability to generate unordered_maps 2017-05-09 13:48:55 +00:00
Pekka Enberg
38a54df863 Fix pre-ScyllaDB copyright statements
People keep tripping over the old copyrights and copy-pasting them to
new files. Search and replace "Cloudius Systems" with "ScyllaDB".

Message-Id: <1460013664-25966-1-git-send-email-penberg@scylladb.com>
2016-04-08 08:12:47 +03:00
Avi Kivity
d5cf0fb2b1 Add license notices 2015-09-20 10:43:39 +03:00
Paweł Dziepak
19d4cd7449 json: do not add a newline at the end of string
Signed-off-by: Paweł Dziepak <pdziepak@cloudius-systems.com>
2015-07-10 01:29:23 +02:00
Paweł Dziepak
da52b5d5da json: explicitly set Json::Value type to objectValue
Proper Json::Value type would be set implicityl after the first map
element is added. That's not going when the map is empty.

Signed-off-by: Paweł Dziepak <pdziepak@cloudius-systems.com>
2015-07-10 01:29:23 +02:00
Paweł Dziepak
8565a22d33 json: fix (de)serialization of map
Signed-off-by: Paweł Dziepak <pdziepak@cloudius-systems.com>
2015-06-30 17:59:42 +02:00
Pekka Enberg
673c0c1759 JSON parsing and formatting helper functions
There's various places in Origin where we convert a Map to a JSON string
and vice versa.

Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
2015-06-11 13:02:42 +03:00