50 descendants of 551bd9234a31fb12
|
2017-01-28
| ||
| 22:48 | Automated merge of server-log-handshaking/2a497f95de/integ into integ-home check-in: ebc39ec805 user: matt tags: integ-home | |
| 21:09 | Automated merge of server-log-handshaking/cc6a49cf21/integ into integ-home check-in: eeae55dd41 user: matt tags: integ-home | |
|
2017-01-25
| ||
| 17:37 | Automated merge of v1.63/e58c0e3fb7/integ into integ-home check-in: 6e5448c9cf user: matt tags: integ-home | |
|
2017-01-24
| ||
| 12:14 | Automated merge of v1.63-xor-report/f2807ed766/integ into integ-home check-in: 4008bc5f1a user: matt tags: integ-home | |
|
2017-01-23
| ||
| 16:56 | Automated merge of pjhatwal/3585f5b63a/integ into integ-home check-in: 447f505fd0 user: matt tags: integ-home | |
| 13:55 | Automated merge of v1.63/a03bdb5581/integ into integ-home check-in: 06185d0933 user: matt tags: integ-home | |
| 12:38 | Automated merge of v1.63-xor-report/b4dc6cb51b/integ into integ-home check-in: 8917440288 user: matt tags: integ-home | |
|
2017-01-21
| ||
| 23:31 | Automated merge of v1.63/f24fe39093/integ into integ-home check-in: 162f0d2bf0 user: matt tags: integ-home | |
| 23:12 | Automated merge of v.1.63-resurrect-db-refresh-timestamp-gate/2637cbf116/integ into integ-home check-in: 3667888d64 user: matt tags: integ-home | |
|
2017-01-20
| ||
| 16:18 | Automated merge of v.1.63-resurrect-db-refresh-timestamp-gate/70c6fdb986/integ into integ-home check-in: cffa0e4079 user: matt tags: integ-home | |
|
2017-01-17
| ||
| 18:32 | Automated merge of v1.63-xor-report/a6a3256f81/integ into integ-home check-in: 9f9463ec84 user: matt tags: integ-home | |
|
2017-01-13
| ||
| 18:27 | Automated merge of v1.63-xor-report/460f43937c/integ into integ-home check-in: bcd8c75f66 user: matt tags: integ-home | |
| 18:08 | Automated merge of v1.63-xor-report/6217b90877/integ into integ-home check-in: c3e1f2c537 user: matt tags: integ-home | |
| 17:50 | Automated merge of v1.63/3e82d9d73f/integ into integ-home check-in: 01a7a8df36 user: matt tags: integ-home | |
| 17:31 | Automated merge of v1.63/cc2e1ee395/integ into integ-home check-in: 6e81dd5f22 user: matt tags: integ-home | |
|
2017-01-12
| ||
| 23:38 | Automated merge of v1.63-stackdumpfix/fa49f48d6b/integ into integ-home check-in: f6e9dc0d59 user: matt tags: integ-home | |
| 23:02 | Automated merge of v1.63/915e9b533a/integ into integ-home check-in: 5e91252ca5 user: matt tags: integ-home | |
| 08:42 | Reset integ-home check-in: ef5654101f user: mrwellan tags: integ-home | |
|
2017-01-05
| ||
| 16:20 | Second try to reset integ-home to solid baseline check-in: 22a67ee14d user: mrwellan tags: integ-home | |
|
2016-12-28
| ||
| 17:22 | Automated merge of v1.63/88034605c0/integ into integ-home check-in: fd7a37d790 user: matt tags: integ-home | |
| 17:04 | Automated merge of pjhatwal/8f1efb99dc/integ into integ-home check-in: c6d366a15d user: matt tags: integ-home | |
| 14:46 | Manual merge to integ-home to fix a conflict check-in: 6673cb2ce0 user: mrwellan tags: integ-home | |
|
2016-12-19
| ||
| 22:50 | Automated merge of v1.63/777bae8a54/integ into integ-home check-in: 94d4e0a530 user: matt tags: integ-home | |
| 17:25 | Automated merge of v1.63/146fa45671/integ into integ-home check-in: c11b6ec11a user: matt tags: integ-home | |
|
2016-12-16
| ||
| 14:43 | Automated merge of v1.63/ca7ed57c94/integ into integ-home check-in: d05283fa70 user: matt tags: integ-home | |
| 13:22 | Automated merge of v1.63/473da90c19/integ into integ-home check-in: 69d0abc279 user: matt tags: integ-home | |
|
2016-12-15
| ||
| 12:40 | Automated merge of v1.63/c16914fba9/integ into integ-home check-in: 7afe215e9b user: matt tags: integ-home | |
| 10:04 | Automated merge of v1.63/5f543006c5/integ into integ-home check-in: 30a74844eb user: matt tags: integ-home | |
| 08:50 | Automated merge of v1.63/0173c4f64d/integ into integ-home check-in: b663604a90 user: matt tags: integ-home | |
|
2016-12-14
| ||
| 22:33 | Re-merge (deltas already captured by cherrypick?) of 5f96 Closed-Leaf check-in: b87b18b983 user: matt tags: re-merge-no-rpc | |
| 16:03 | Automated merge of v1.63/327a91c7af/integ into integ-home check-in: e579af93cc user: matt tags: integ-home | |
| 09:03 | Automated merge of v1.63/da4a953ead/integ into integ-home check-in: b4fad76305 user: matt tags: integ-home | |
|
2016-12-13
| ||
| 18:01 | Automated merge of trunk/4b3bf0b62b/integ into integ-home check-in: b5b44bddc1 user: matt tags: integ-home | |
|
2016-12-12
| ||
| 14:39 | Automated merge of trunk/36aa2d76fe/integ into integ-home check-in: db82cd966b user: matt tags: integ-home | |
| 14:21 | Automated merge of trunk/906d8ca5cb/integ into integ-home check-in: ceb991e958 user: matt tags: integ-home | |
|
2016-12-11
| ||
| 19:22 | Automated merge of v1.63/a4468798cf/integ into integ-home check-in: dfeb3bcf9a user: matt tags: integ-home | |
| 11:22 | Committing automated merge of v1.63/d6f19abb24/integ into check-in: 8533e41b48 user: matt tags: integ-home | |
| 00:12 | Committing automated merge of v1.63/d6290cc32a/integ into integ-home check-in: 060f5e8ec6 user: matt tags: integ-home | |
|
2016-12-10
| ||
| 21:20 | Added couple helpers to configf. Fixed -test-files. Updated manual Closed-Leaf check-in: 5f96a1cd71 user: matt tags: v1.63-fix-db-sync | |
| 16:43 | Committing automated merge of v1.63/b4d0474c03 into integ-home check-in: 3614af84bf user: matt tags: integ-home | |
| 14:44 | Added some missing apt libs and changed default to chicken 4.10 as 4.11 seems to have problems check-in: b4d0474c03 user: matt tags: v1.63-fix-db-sync | |
|
2016-12-09
| ||
| 17:33 |
merged v1.62-rpc. Adds rpc transport capability but leaves default http.
NOTE: This commit appears to have broken the db sync-back to megatest.db. Moving this to side branch for repairs. check-in: c9ec425fc4 user: bjbarcla tags: v1.63-fix-db-sync | |
| 17:25 | switched default transport back to http Closed-Leaf check-in: 37f53d58ab user: bjbarcla tags: v1.62-rpc | |
|
2016-12-08
| ||
| 14:54 | made rpc default transport, not http. check-in: ee51b46291 user: bjbarcla tags: v1.62-rpc | |
| 14:46 | fixed a few bugs - orphaned client tcp ports, sql error (Matt fixed in v1.63 which we are merging in this commit) check-in: e5d7dac0b8 user: bjbarcla tags: v1.62-rpc | |
| 09:55 | Merged in fix for wrong num params check-in: 3b6ab0c796 user: mrwellan tags: v1.62-rpc | |
|
2016-12-07
| ||
| 21:19 | fixed stackdump at end of megatest (was doing http close all connections even if using rpc transport) check-in: 27b30355f5 user: bjbarcla tags: v1.62-rpc | |
| 20:53 | merged v1.63 check-in: e25c16ede1 user: bjbarcla tags: v1.62-rpc | |
| 20:52 | got test4 to run with rpc, but hit deadlock and errors in some tests. check-in: 551bd9234a user: bjbarcla tags: v1.62-rpc | |