Commit Graph

19 Commits

Author SHA1 Message Date
Yang Gao 91cc48160a Merge remote-tracking branch 'upstream/master' into pubsub 2015-03-02 15:19:25 -08:00
Nicolas "Pixel" Noble 1ff52d5278 Guard headers tool. 2015-03-01 06:18:14 +01:00
Yang Gao 0706ce8a19 remove debug bits 2015-02-27 14:31:02 -08:00
Yang Gao 7795324d19 Redo #817. Update pubsub example channel creation and credentials 2015-02-27 14:28:05 -08:00
Craig Tiller cf133f41f8 Make it possible to compile with gcc4.6 2015-02-26 14:27:05 -08:00
Abhishek Kumar 85f9963e14 Update README 2015-02-25 11:45:05 -08:00
Craig Tiller e4fe844b67 s/CreateChannel/CreateChannelDeprecated
For the 2-argument version of CreateChannel.

This is a temporary step until #711 is ready to roll out.
2015-02-23 13:55:15 -08:00
Yang Gao bbd67c0499 clean up some internal path and names 2015-02-20 13:04:52 -08:00
Craig Tiller 99d6593db8 Merge pull request #638 from vjpai/expecteq
EXPECT_EQ sign issue...
2015-02-19 21:16:50 -08:00
Nicolas "Pixel" Noble 7e80efcb3d Making the usage of gflags uniform across distributions. 2015-02-20 03:13:38 +01:00
Nicolas "Pixel" Noble ba6082080c Fixing gflags' include path. 2015-02-20 02:48:03 +01:00
vjpai dbbdda5247 EXPECT_EQ Mac issue... 2015-02-19 17:02:54 -08:00
Craig Tiller ce5021b0b9 Add missing new-lines at end of file 2015-02-18 09:25:21 -08:00
Craig Tiller 190d360def Add missing new-lines at end of file 2015-02-18 09:23:38 -08:00
Craig Tiller 0605995e55 Update copyright to 2015 2015-02-18 08:34:56 -08:00
Craig Tiller f74ec4ee43 Merge github.com:grpc/grpc into copyright 2015-02-18 08:30:14 -08:00
Craig Tiller ad1fd3a49e Add proto copyrights 2015-02-16 12:23:04 -08:00
Craig Tiller 421e87a1b0 Merge github.com:grpc/grpc into c++api
Conflicts:
	Makefile
2015-02-13 14:23:54 -08:00
Chen wang 842325110d Rename examples/tips to examples/pubsub 2015-02-12 17:29:18 -08:00