Commit Graph

491 Commits

Author SHA1 Message Date
Alistair Veitch 7771544111 rename census log files to avoid build breakage on MacOS 2016-02-22 14:20:25 -08:00
Masood Malekghassemi 9f79159590 Merge pull request #5302 from nicolasnoble/python-windows
Enabling python artifact building for Windows.
2016-02-22 11:37:22 -08:00
Nicolas "Pixel" Noble 2e8fdbac77 Building the dlls. 2016-02-19 05:39:15 +01:00
Sree Kuchibhotla 3cce2ecb12 Merge pull request #4859 from ctiller/sceq
Subchannel Sharing  [The interop tests failures and Basic test failures are unrelated to this change. Merging]
2016-02-17 16:03:52 -08:00
Nicolas "Pixel" Noble 639766023e Flagging the missing API entries. 2016-02-17 23:43:55 +01:00
Craig Tiller c0ce00fd16 Merge github.com:grpc/grpc into sceq 2016-02-17 14:25:12 -08:00
Bogdan Drutu a3d33b93c4 Merge pull request #5277 from soltanmm/abimerp
Extern "C" Python DLL support
2016-02-17 12:03:14 -08:00
Masood Malekghassemi d01391233a Extern "C" Python DLL support 2016-02-17 12:00:49 -08:00
Bogdan Drutu 399d34bef4 Fix pygrpc_load_core in pxi to match with the C definition 2016-02-16 19:37:15 -08:00
Bogdan Drutu 43f6311c58 Merge pull request #5098 from a-veitch/base_log
Add Census base log
2016-02-16 09:54:31 -08:00
Nicolas "Pixel" Noble f083013bd7 Merge remote-tracking branch 'google/release-0_13' into upmerge-from-0.13
Conflicts:
	Makefile
	build.yaml
	package.json
	setup.py
	src/core/surface/version.c
	src/csharp/Grpc.Core/VersionInfo.cs
	src/csharp/build_packages.bat
	src/python/grpcio/grpc_version.py
	src/ruby/lib/grpc/version.rb
	tools/doxygen/Doxyfile.c++
	tools/doxygen/Doxyfile.c++.internal
	tools/doxygen/Doxyfile.core
	tools/doxygen/Doxyfile.core.internal
2016-02-13 04:38:20 +01:00
Masood Malekghassemi 44753c39e1 Merge pull request #5237 from nicolasnoble/flagging-release-as-0_13_1-pre1
Flagging 0.13.1-pre1.
2016-02-12 18:51:47 -08:00
Masood Malekghassemi 99a4e9e867 Merge pull request #5230 from soltanmm/doc
Update Python doc
2016-02-12 16:47:15 -08:00
Nicolas "Pixel" Noble 6910ce8e01 Flagging 0.13.1-pre1. 2016-02-13 01:03:26 +01:00
Nicolas "Pixel" Noble 7a925f7f5e Flagging the release. 2016-02-13 00:39:12 +01:00
Masood Malekghassemi dfab11919e Update Python doc 2016-02-12 15:20:34 -08:00
Masood Malekghassemi f747409f6f Use precompiled extensions only 2016-02-12 13:45:37 -08:00
Masood Malekghassemi cd4358460d Bump Python version 2016-02-11 20:12:48 -08:00
Masood Malekghassemi dd6ee7af7e Truncate Python target triple 2016-02-11 20:08:49 -08:00
Craig Tiller c35e2c582f Revert "Proto API for LB request/responses" 2016-02-11 15:45:03 -08:00
Masood Malekghassemi b6d3a8238d Paper over custom command limitations
The custom gRPC bdist command depends on numerous undocumented and
private behaviors of setuptools, wheel, distutils, etc. One such is the
ordering of generated distribution targets. We paper over this under the
assumption that the command will only be useful for gRPC devs, and
document with a command description a contractual obligation of users of
the command.
2016-02-11 14:08:11 -08:00
Masood Malekghassemi 334e9e6fa2 Use wheels instead for custom bdists 2016-02-11 12:00:55 -08:00
Alistair Veitch 749250f6a0 merge to HEAD 2016-02-11 09:23:20 -08:00
David Garcia Quintas 742a783c0d Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-02-11 01:04:28 -08:00
Nicolas Noble 9c7961a014 Merge pull request #5165 from ctiller/bring_back_gpr
Bring back gpr
2016-02-10 17:39:45 -08:00
Craig Tiller f73429901a Merge github.com:grpc/grpc into sceq 2016-02-09 16:32:51 -08:00
Nathaniel Manista ecf8327b3d Merge pull request #5100 from nathanielmanistaatgoogle/python-grpc_set_ssl_roots_override_callback
grpc_set_ssl_roots_override_callback for Python.
2016-02-09 13:26:56 -08:00
Craig Tiller 1298afd10e Get compilation working again 2016-02-09 12:29:17 -08:00
Craig Tiller da179ce598 Rollback gpr deletion 2016-02-09 12:01:53 -08:00
Nathaniel Manista fa6cad701c grpc_set_ssl_roots_override_callback for Python 2016-02-09 19:02:56 +00:00
David Garcia Quintas 7e46618897 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-02-08 20:07:19 -08:00
Nicolas "Pixel" Noble 1935c3655c Flagging master as 0.14.0-dev. 2016-02-09 01:54:56 +01:00
Nicolas "Pixel" Noble cda4bad582 Flagging 0.13 as pre1. 2016-02-09 00:44:23 +01:00
Nicolas Noble 824a0903a5 Merge pull request #5129 from ctiller/version_number
build.yaml centric versioning
2016-02-08 15:12:47 -08:00
Nathaniel Manista 757c157d86 Merge pull request #5134 from soltanmm/cleaners
Clean-up Python linux-binary installation.
2016-02-08 14:57:59 -08:00
Masood Malekghassemi 35afe4afaf Fall back to building if GCS cannot be reached 2016-02-08 14:51:31 -08:00
Masood Malekghassemi 6598ce16db Move os.environ to module-level 2016-02-08 14:51:04 -08:00
Alistair Veitch e28e426af5 Merge branch 'master' into base_log 2016-02-08 13:08:24 -08:00
Craig Tiller f008f067f8 build.yaml centric versioning 2016-02-08 12:48:03 -08:00
Masood Malekghassemi 064d37d380 Fix GCS URL for Python 2016-02-08 12:19:24 -08:00
Craig Tiller 55e813f946 Merge pull request #5088 from murgatroid99/core_long_int64_t
Replace 'long' with 'int64_t' in public core headers
2016-02-08 10:22:42 -08:00
Nicolas "Pixel" Noble 1be92658ef Versionning Ruby from build.yaml, and regenerating broken files after census merge. 2016-02-06 09:30:19 +01:00
Craig Tiller 5c04760d46 Change default on Python install option 2016-02-05 14:25:56 -08:00
Alistair Veitch ba6065f016 merge 2016-02-05 13:27:42 -08:00
murgatroid99 7a55684a13 Clang format and fix copyrights 2016-02-05 11:33:30 -08:00
murgatroid99 309830f6b8 Replace 'long' with 'int64_t' in public core headers 2016-02-05 11:30:00 -08:00
Masood Malekghassemi a7a50785be Don't die on missing win32 resources on non-win32 2016-02-04 14:21:09 -08:00
Masood Malekghassemi f751b0b549 Use envvar for binary repository 2016-02-04 14:21:09 -08:00
Bogdan Drutu e4fdcd9242 Merge pull request #5013 from a-veitch/tag_set_to_context
Change all instances of census_tag_set to census_context
2016-02-04 12:42:35 -08:00
Craig Tiller 411da52f1d Merge pull request #5064 from nicolasnoble/win32-python
Win32 python
2016-02-04 10:39:38 -08:00