Commit Graph

1467 Commits

Author SHA1 Message Date
Gennadiy Civil
ed8d02cfc6
Update .travis.yml
Trying to get around mongoDB expired keys, etc
2018-01-11 17:03:14 -05:00
Gennadiy Civil
73d1251fe9
Update .travis.yml 2018-01-11 16:57:44 -05:00
Gennadiy Civil
cfd29e0488
Update .travis.yml 2018-01-11 16:55:21 -05:00
Gennadiy Civil
29f94e0106
Update .travis.yml 2018-01-11 14:57:50 -05:00
Gennadiy Civil
13218917c8
Merge pull request #1399 from gennadiycivil/master
Merging, Upstream cl 103120214
2018-01-11 14:26:47 -05:00
Gennadiy Civil
5add34775c Merge branch 'master' of https://github.com/google/googletest 2018-01-11 11:31:37 -05:00
Gennadiy Civil
6914ae2394 Upstream cl 103120214 2018-01-11 11:31:23 -05:00
Gennadiy Civil
836c419c0d
Merge pull request #1398 from gennadiycivil/master
more cleanup
2018-01-11 11:30:51 -05:00
Gennadiy Civil
1d757db65c More merge, cleanup 2018-01-10 16:49:20 -05:00
Gennadiy Civil
b44ed21905 Merge branch 'master' of https://github.com/google/googletest 2018-01-10 16:46:21 -05:00
Gennadiy Civil
481fe9446a More merge, cleanup 2018-01-10 16:45:59 -05:00
Gennadiy Civil
cac5d7ce1a
Merge pull request #1397 from gennadiycivil/master
Code Merge, upsteam of accumulated changes, cleanup
2018-01-10 16:09:23 -05:00
Gennadiy Civil
84aa45941f Merge branch 'master' of https://github.com/google/googletest 2018-01-10 14:42:37 -05:00
Gennadiy Civil
6a26e47cfc Code merge, upstreaming accumulated changes, cleanup 2018-01-10 14:42:29 -05:00
Gennadiy Civil
d7196896bb
Merge pull request #1396 from gennadiycivil/master
small cleanup/,merge
2018-01-10 14:35:21 -05:00
Gennadiy Civil
62dbaa2947 revert 2018-01-10 14:00:52 -05:00
Gennadiy Civil
d630a8bdac code merges, cleanup 2018-01-10 13:58:00 -05:00
Gennadiy Civil
6efe104aed
Merge pull request #1395 from gennadiycivil/master
code merge, cleanups
2018-01-10 11:59:44 -05:00
Gennadiy Civil
f33902b97a revert googletest/test/gtest-param-test_test.cc 2018-01-10 11:04:49 -05:00
Gennadiy Civil
f729a2867e Merge branch 'master' of github.com:gennadiycivil/googletest 2018-01-10 10:57:37 -05:00
Gennadiy Civil
8034001188 Merge branch 'master' of https://github.com/google/googletest 2018-01-10 10:57:21 -05:00
Gennadiy Civil
505de1d6e2
Merge branch 'master' into master 2018-01-10 10:42:25 -05:00
Gennadiy Civil
6eccdb7b62
Update .travis.yml 2018-01-10 10:20:09 -05:00
Gennadiy Civil
2f31bfab6b Merge branch 'master' of https://github.com/google/googletest 2018-01-09 22:47:12 -05:00
Gennadiy Civil
d237297ceb code merge, cleanups 2018-01-09 22:46:17 -05:00
Gennadiy Civil
509e78be23
Merge pull request #1394 from gennadiycivil/master
wip, cleanups/merge
2018-01-09 20:22:14 -05:00
Gennadiy Civil
2ad5661db2 Upstream of cl 129104714 2018-01-09 16:41:15 -05:00
Gennadiy Civil
5eecadf67a Revert one file 2018-01-09 15:46:44 -05:00
Gennadiy Civil
9fce984a67 wip, cleanups/merge 2018-01-09 14:48:06 -05:00
Gennadiy Civil
2301524923
Merge pull request #1393 from gennadiycivil/master
cleanup, merge
2018-01-09 14:45:55 -05:00
Gennadiy Civil
1df907381d
Merge branch 'master' into master 2018-01-09 14:00:25 -05:00
Gennadiy Civil
258fd6e168 cleanup, merge 2018-01-09 13:59:27 -05:00
Gennadiy Civil
e194f52114
Merge pull request #1388 from rongjiecomputer/bazel
[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
2018-01-08 22:07:26 -05:00
Loo Rong Jie
cbd15d417e [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
and x64_windows_msvc
2018-01-09 08:29:44 +08:00
Gennadiy Civil
c3bb0ee2a6
Merge pull request #1390 from gennadiycivil/master
Small cleanups, merge
2018-01-08 17:10:16 -05:00
Gennadiy Civil
91ba05cc36 Small cleanups, merge 2018-01-08 16:14:06 -05:00
Gennadiy Civil
3d27bdef53
Merge pull request #1387 from coryan/optimize-build-matrix-ready
Optimize build matrix on pull requests
2018-01-08 10:50:13 -05:00
Gennadiy Civil
4371b996ed
Merge pull request #1385 from gennadiycivil/master
code cleanup in preparation for merges, cl 180857299
2018-01-06 00:02:40 -05:00
Gennadiy Civil
fab06101d7
Merge branch 'master' into master 2018-01-05 15:34:07 -05:00
Carlos O'Ryan
67d6e46728
Use correct name for build event types. 2018-01-05 14:58:48 -05:00
Gennadiy Civil
67476c1426 Revert one file for now 2018-01-05 12:35:41 -05:00
Carlos O'Ryan
adfdc65ca7
Fixed test for pull request. 2018-01-05 11:01:37 -05:00
Gennadiy Civil
5b26b0fce7
Merge pull request #1007 from davidben/missing-declarations
Pass the -Wmissing-declarations warning.
2018-01-05 10:18:26 -05:00
Carlos O'Ryan
d3acb4ba18
Fixed output and test for 'enabled_on_pr' 2018-01-05 09:32:50 -05:00
Gennadiy Civil
6b4967a23a
Merge branch 'master' into missing-declarations 2018-01-04 22:01:38 -05:00
Gennadiy Civil
abbc0f8174
Merge pull request #1377 from davidben/clang-cl
Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.
2018-01-04 21:59:48 -05:00
Gennadiy Civil
19b5774ccf code cleanup in preparation for merges, cl 180857299 2018-01-04 21:49:27 -05:00
Carlos O'Ryan
9cee677ce4
Optimize build matrix (#1)
Disable expensive builds on pull requests.
2018-01-04 13:04:31 -05:00
Gennadiy Civil
be6ee26a9b
Merge pull request #1378 from gennadiycivil/master
upstreaming cl 124976692
2018-01-04 12:17:46 -05:00
Gennadiy Civil
4216f869f7
Merge branch 'master' into master 2018-01-04 10:13:00 -05:00