Roman Gordeev rgordeev

Combining two git repositories

Use case: You have repository A with remote location rA, and repository B (which may or may not have remote location rB). You want to do one of two things:

preserve all commits of both repositories, but replace everything from A with the contents of B, and use rA as your remote location
actually combine the two repositories, as if they are two branches that you want to merge, using rA as the remote location

NB: Check out git subtree/git submodule and this Stack Overflow question before going through the steps below. This gist is just a record of how I solved this problem on my own one day.

Before starting, make sure your local and remote repositories are up-to-date with all changes you need. The following steps use the general idea of changing the remote origin and renaming the local master branch of one of the repos in order to combine the two master branches.

Hey! I saw this has been indexed by the search engines. It is a first draft of a post I ended up publishing on my blog at: Scaling PostgreSQL With Pgpool and PgBouncer

Thanks for stopping by!

PostgreSQL and Pgpool Architecture

3rd-party image processing/manipulation services

The introduction to Reactive Programming you've been missing

(by @andrestaltz)

This tutorial as a series of videos

If you prefer to watch video tutorials with live-coding, then check out this series I recorded with the same contents as in this article: Egghead.io - Introduction to Reactive Programming.

Требования

Для работы необходим PostgreSQL-server 9.5 и, более-менее "свежий", Docker

Настройка сервера баз данных

Т.к. app-server и worker работают в docker-контейнерах, то следует прописать его (докера) сеть в pg_hba.conf

host    all             all  172.17.0.0/24 password

Direct links to free Springer books (pdf versions)

Graduate texts in mathematics

duplicates = multiple editions

A Classical Introduction to Modern Number Theory, Kenneth Ireland Michael Rosen

	package demo;

	import javax.persistence.Entity;
	import javax.persistence.GeneratedValue;
	import javax.persistence.Id;
	import javax.persistence.Table;

	import org.hibernate.annotations.GenericGenerator;
	import org.hibernate.annotations.Parameter;
	import org.springframework.boot.SpringApplication;

	# Add to nginx.conf http section
	map $http_upgrade $connection_upgrade {
	default upgrade;
	'' close;
	}

	# stream oriented kurento
	#
	# VERSION 4.4.3

	FROM ubuntu:14.04
	MAINTAINER Patxi Gortázar <[email protected]>

	RUN apt-get update \
	&& apt-get -y dist-upgrade \
	&& apt-get install -y wget

	#!/usr/bin/env python
	#
	# pyget2.py
	# A python download accelerator
	#
	# This file uses multiprocessing along with
	# chunked/parallel downloading to speed up
	# the download of files (if possible).
	#
	# @author Benjamin Hutchins