Commits · d629744ec0e08d4e8b27ec18ec8e38ca52fea843 · yangql / googletest

15 Jan, 2018 4 commits
- More code merges · d629744e
  Gennadiy Civil authored Jan 15, 2018
  
  d629744e
- Merge branch 'master' of https://github.com/google/googletest · 6c865988
  Gennadiy Civil authored Jan 15, 2018
  
  6c865988
- Code merging · da1f7fe1
  Gennadiy Civil authored Jan 15, 2018
  
  da1f7fe1
- Merge pull request #1339 from Romain-Geissler/fix-core-dump-shared · 051fe2fa
  Gennadiy Civil authored Jan 15, 2018
```
Fix double free when building Gtest/GMock in shared libraries and lin…
```
  051fe2fa
13 Jan, 2018 2 commits
- Merge branch 'master' into fix-core-dump-shared · f6887b5c
  Gennadiy Civil authored Jan 13, 2018
  
  f6887b5c
- Merge pull request #1400 from gennadiycivil/master · 63ded6c2
  Gennadiy Civil authored Jan 12, 2018
```
Upstream/merge
```
  63ded6c2
11 Jan, 2018 11 commits
- continue upstream/merge, etc · 93b77987
  Gennadiy Civil authored Jan 11, 2018
  
  93b77987
- Merge branch 'master' of https://github.com/google/googletest · 717d784a
  Gennadiy Civil authored Jan 11, 2018
  
  717d784a
- Update .travis.yml · ed8d02cf
  Gennadiy Civil authored Jan 11, 2018
```
Trying to get around mongoDB expired keys, etc
```
  ed8d02cf
- Update .travis.yml · 73d1251f
  Gennadiy Civil authored Jan 11, 2018
  
  73d1251f
- Update .travis.yml · cfd29e04
  Gennadiy Civil authored Jan 11, 2018
  
  cfd29e04
- Update .travis.yml · 29f94e01
  Gennadiy Civil authored Jan 11, 2018
  
  29f94e01
- Trying to fix travis · 2982dc1a
  Gennadiy Civil authored Jan 11, 2018
  
  2982dc1a
- Merge pull request #1399 from gennadiycivil/master · 13218917
  Gennadiy Civil authored Jan 11, 2018
```
Merging, Upstream cl 103120214
```
  13218917
- Merge branch 'master' of https://github.com/google/googletest · 5add3477
  Gennadiy Civil authored Jan 11, 2018
  
  5add3477
- Upstream cl 103120214 · 6914ae23
  Gennadiy Civil authored Jan 11, 2018
  
  6914ae23
- Merge pull request #1398 from gennadiycivil/master · 836c419c
  Gennadiy Civil authored Jan 11, 2018
```
more cleanup
```
  836c419c
10 Jan, 2018 18 commits
- More merge, cleanup · 1d757db6
  Gennadiy Civil authored Jan 10, 2018
  
  1d757db6
- Merge branch 'master' of https://github.com/google/googletest · b44ed219
  Gennadiy Civil authored Jan 10, 2018
  
  b44ed219
- More merge, cleanup · 481fe944
  Gennadiy Civil authored Jan 10, 2018
  
  481fe944
- Merge pull request #1397 from gennadiycivil/master · cac5d7ce
  Gennadiy Civil authored Jan 10, 2018
```
Code Merge, upsteam of accumulated changes, cleanup
```
  cac5d7ce
- Merge branch 'master' of https://github.com/google/googletest · 84aa4594
  Gennadiy Civil authored Jan 10, 2018
  
  84aa4594
- · 6a26e47c
  Gennadiy Civil authored Jan 10, 2018
```
Code merge, upstreaming accumulated changes, cleanup
```
  6a26e47c
- Merge pull request #1396 from gennadiycivil/master · d7196896
  Gennadiy Civil authored Jan 10, 2018
```
small cleanup/,merge
```
  d7196896
- revert · 62dbaa29
  Gennadiy Civil authored Jan 10, 2018
  
  62dbaa29
- · d630a8bd
  Gennadiy Civil authored Jan 10, 2018
```
code merges, cleanup
```
  d630a8bd
- Merge pull request #1395 from gennadiycivil/master · 6efe104a
  Gennadiy Civil authored Jan 10, 2018
```
code merge, cleanups
```
  6efe104a
- · f33902b9
  Gennadiy Civil authored Jan 10, 2018
```
revert googletest/test/gtest-param-test_test.cc
```
  f33902b9
- Merge branch 'master' of github.com:gennadiycivil/googletest · f729a286
  Gennadiy Civil authored Jan 10, 2018
  
  f729a286
- Merge branch 'master' of https://github.com/google/googletest · 80340011
  Gennadiy Civil authored Jan 10, 2018
  
  80340011
- Merge branch 'master' into master · 505de1d6
  Gennadiy Civil authored Jan 10, 2018
  
  505de1d6
- Update .travis.yml · 6eccdb7b
  Gennadiy Civil authored Jan 10, 2018
  
  6eccdb7b
- Merge branch 'master' of https://github.com/google/googletest · 2f31bfab
  Gennadiy Civil authored Jan 09, 2018
  
  2f31bfab
- · d237297c
  Gennadiy Civil authored Jan 09, 2018
```
code merge, cleanups
```
  d237297c
- Merge pull request #1394 from gennadiycivil/master · 509e78be
  Gennadiy Civil authored Jan 09, 2018
```
wip, cleanups/merge
```
  509e78be
09 Jan, 2018 5 commits
- Upstream of cl 129104714 · 2ad5661d
  Gennadiy Civil authored Jan 09, 2018
  
  2ad5661d
- Revert one file · 5eecadf6
  Gennadiy Civil authored Jan 09, 2018
  
  5eecadf6
- · 9fce984a
  Gennadiy Civil authored Jan 09, 2018
```
wip, cleanups/merge
```
  9fce984a
- Merge pull request #1393 from gennadiycivil/master · 23015249
  Gennadiy Civil authored Jan 09, 2018
```
cleanup, merge
```
  23015249
- Merge branch 'master' into master · 1df90738
  Gennadiy Civil authored Jan 09, 2018
  
  1df90738